Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Jul 2011 17:33:35 +0000 (10:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Jul 2011 17:33:35 +0000 (10:33 -0700)
commit8e1d2c1c343cfa21ea0b944b46eabfe30c5a61b7
tree2594e1e07d339a085817b754b54e5920f4d764c4
parent0b447b146459b62c0b4e096d7f6f0ab5bb6ce211
parente8a1d15316580a6e65b43ad7c40ef748560e3a29
Merge from trunk.